Register GtkPrintCapabilities

diff --git a/ChangeLog b/ChangeLog
index b70a6a05bb79db86e2c08ed7d3f52d8a4989ccd2..ab1ef459f563fecf9495f3d6024c15502d1a61cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-10  Matthias Clasen <mclasen@redhat.com>
+
+       * gtk/gtk.symbols:
+       * gtk/gtkprintjob.[hc]: Register GtkPrintCapabilities as a
+       flags type.  (#344504, Marko Anastasov)
+
 2006-06-09  Benjamin Berg  <benjamin@sipsolutions.net>
 
        * gtk/gtkmenuitem.c: (get_offsets): Take GtkMenu::horizontal-padding

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b70a6a05bb79db86e2c08ed7d3f52d8a4989ccd2..ab1ef459f563fecf9495f3d6024c15502d1a61cc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-06-10  Matthias Clasen <mclasen@redhat.com>
+
+       * gtk/gtk.symbols:
+       * gtk/gtkprintjob.[hc]: Register GtkPrintCapabilities as a
+       flags type.  (#344504, Marko Anastasov)
+
 2006-06-09  Benjamin Berg  <benjamin@sipsolutions.net>
 
        * gtk/gtkmenuitem.c: (get_offsets): Take GtkMenu::horizontal-padding

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index ad0aada7e9dd678360245a0aff77fac79805fe38..a645b956ff9033bff9f636a7d1834f5930e42351 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2679,6 +2679,7 @@ gtk_print_job_get_surface
 gtk_print_job_send
 gtk_print_job_set_track_print_status
 gtk_print_job_get_track_print_status
+gtk_print_capabilities_get_type G_GNUC_CONST
 #endif
 #endif
 #endif

diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c
index 2781c996caf73e4e91eaa93b7298d57681dfaec4..522256df34baa7c717ffc2ba7656292fcefabeba 100644 (file)
--- a/gtk/gtkprintjob.c
+++ b/gtk/gtkprintjob.c
@@ -638,5 +638,28 @@ gtk_print_job_send (GtkPrintJob             *job,
   return TRUE;
 }
 
+GType
+gtk_print_capabilities_get_type (void)
+{
+  static GType etype = 0;
+
+  if (etype == 0)
+    {
+      static const GFlagsValue values[] = {
+        { GTK_PRINT_CAPABILITY_PAGE_SET, "GTK_PRINT_CAPABILITY_PAGE_SET", "page-set" },
+        { GTK_PRINT_CAPABILITY_COPIES, "GTK_PRINT_CAPABILITY_COPIES", "copies" },
+        { GTK_PRINT_CAPABILITY_COLLATE, "GTK_PRINT_CAPABILITY_COLLATE", "collate" },
+        { GTK_PRINT_CAPABILITY_REVERSE, "GTK_PRINT_CAPABILITY_REVERSE", "reverse" },
+        { GTK_PRINT_CAPABILITY_SCALE, "GTK_PRINT_CAPABILITY_SCALE", "scale" },
+        { 0, NULL, NULL }
+      };
+
+      etype = g_flags_register_static (I_("GtkPrintCapabilities"), values);
+    }
+
+  return etype;
+}
+
+
 #define __GTK_PRINT_JOB_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h
index 96b668eb22e6071137c420b843177c06274dd939..3b169af00abc9c265f0cd2ce54af95d91f21083b 100644 (file)
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -64,14 +64,14 @@ struct _GtkPrintJob
    */
   GtkPrintPages print_pages;
   GtkPageRange *page_ranges;
-  int num_page_ranges;
+  gint num_page_ranges;
   gboolean rotate_to_orientation;
   
   GtkPageSet page_set;
-  int num_copies;
+  gint num_copies;
   gboolean collate;
   gboolean reverse;
-  double scale;
+  gdouble scale;
 };
 
 struct _GtkPrintJobClass
@@ -90,7 +90,7 @@ struct _GtkPrintJobClass
   void (*_gtk_reserved7) (void);
 };
 
-GType                    gtk_print_job_get_type     (void) G_GNUC_CONST;
+GType                    gtk_print_job_get_type               (void) G_GNUC_CONST;
 GtkPrintJob             *gtk_print_job_new                    (const gchar              *title,
                                                               GtkPrinter               *printer,
                                                               GtkPrintSettings         *settings,
@@ -113,6 +113,7 @@ gboolean                 gtk_print_job_send                   (GtkPrintJob
                                                               GDestroyNotify            dnotify,
                                                               GError                  **error);
 
+GType                    gtk_print_capabilities_get_type      (void) G_GNUC_CONST;
 
 G_END_DECLS